Update build-dep

diff --git a/debian/changelog b/debian/changelog
index 72348c0fdcd161723d357d78207b743e68b773c5..30df64ca6c246515b1c190cf552c86def9ea58fe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+opencc (1.1.9+ds1-1~exp1) experimental; urgency=medium
+
+  * New upstream release.
+  * debian/control: Add new build-test-dependency python3-pytest.
+  * debian/patches/0002: Dropped, merged upstream.
+
+ -- Boyuan Yang <byang@debian.org>  Tue, 13 Aug 2024 12:52:04 -0400
+
 opencc (1.1.8+ds1-3) unstable; urgency=medium
 
   * Upload to unstable. Closes: #1077816

diff --git a/debian/control b/debian/control
index ffe819eff0a21b6bc124d673f405f7eca603f995..192e42d6d52f8df4144ed3ac8ef1c2e4119564f6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends:
  python3-dev,
  rapidjson-dev,
  pybuild-plugin-pyproject,
+ python3-pytest <!nocheck>,
  python3-setuptools,
  python3-wheel,
 Standards-Version: 4.6.2

diff --git a/debian/patches/0002-data-Explicitly-use-python3.patch b/debian/patches/0002-data-Explicitly-use-python3.patch
deleted file mode 100644 (file)
index 2e4d3ac..0000000
--- a/debian/patches/0002-data-Explicitly-use-python3.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Boyuan Yang <byang@debian.org>
-Date: Thu, 25 Jun 2020 20:32:44 -0400
-Subject: data/: Explicitly use python3
-
-Before "python" is default to python3, this patch should be kept.
-
-Last-Update: 2020-06-25
----
- data/scripts/find_target.py | 2 +-
- data/scripts/merge.py       | 2 +-
- data/scripts/reverse.py     | 2 +-
- data/scripts/sort.py        | 2 +-
- data/scripts/sort_all.py    | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/data/scripts/find_target.py b/data/scripts/find_target.py
-index 4244949..7b2b477 100755
---- a/data/scripts/find_target.py
-+++ b/data/scripts/find_target.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- import sys
-diff --git a/data/scripts/merge.py b/data/scripts/merge.py
-index 680c90e..01fcf51 100755
---- a/data/scripts/merge.py
-+++ b/data/scripts/merge.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- import codecs
-diff --git a/data/scripts/reverse.py b/data/scripts/reverse.py
-index 746f887..a87ae46 100755
---- a/data/scripts/reverse.py
-+++ b/data/scripts/reverse.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- 
- import sys
-diff --git a/data/scripts/sort.py b/data/scripts/sort.py
-index f7d4dc5..6ad6e8c 100755
---- a/data/scripts/sort.py
-+++ b/data/scripts/sort.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- import sys
- 
-diff --git a/data/scripts/sort_all.py b/data/scripts/sort_all.py
-index bd57ae7..c742413 100755
---- a/data/scripts/sort_all.py
-+++ b/data/scripts/sort_all.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- import glob
- import sys

diff --git a/debian/patches/series b/debian/patches/series
index b62fc18c1b1ee0cc6f35a576d3b867ddec1cf72f..a577d9a999a7e5f542d3457474b2a8fe09dc876a 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-use-cmake-install-libdir.patch
-0002-data-Explicitly-use-python3.patch
 0003-no-remote-images-when-reading-docs-on-disk.patch
 0004-Use-system-googletest.patch
 0005-Disable-build-in-setup.py.patch

diff --git a/debian/tests/control b/debian/tests/control
index 36df47b497ae34aaa154e3d85ff993405d18ad5b..5afd579ae0dab645245d3a96ab91b3fad7f2294d 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,6 +3,6 @@ Depends:
  build-essential,
  cmake,
  googletest,
- pkg-config,
+ pkgconf,
  @,
 Restrictions: allow-stderr,